- Clean up pattern matching to make it kick in immediately for some
commands not requiring multiple arguments