Fix up sloppy goatbug users, futz with CommandParser a bit