Changed structure of parser such that it correctly overloads
TokenParsing using some newtype hackery.