Start switching to real command parser.