Un-optional the non-optional commands.
Merge pull request #146 from daenney/mv-optional-commands

Un-optional the non-optional commands.