Simplify the command parser.