Make our command parser less eager

Fixes #1152