A cleaner selectors system for commands

Another option for #1800.