This doesn't fix a particular issue, but makes designing keybinds for org-mode more predictable and less vulnerable to unpredictable changes imposed by evil-collection.