The "Character reference data" tokeniser state should probably be renamed to "Character reference in data". Adding "in" would arguably make the name more accurately descriptive and furthermore consistent with the "Character reference in attribute" state. -- Øistein E. Andersen