Commands Refactor Part 2

We split #196 in two parts. this is the second. (#262 is the first). This builds on all the changes to commands/.
I'm still not convinced on them, since I believe this one option is the only case so far where we have needed it.