Specs: Tokeniser fixes: simplify the entity parser to just do string compares, fix copy-pasta

BUG=7

Review URL: https://codereview.chromium.org/683493003