Got rid of the string matching for commands and went purely to token
matching, it was causing problems when shorter commands were introduced
(.c was matching .choose, for instance).