Fixed some line/column numbers; Moved unparsed entity reference code to tokenizer