Don't use Parsec token parsing, fix @<num> bugs