Lexer again?

Working on the Handler made me realize that the Lexer needed some teensy-tiny functionality adds. They are in now, and tested already. In addition to making the calls to the handlers cleaner, they should actually make error reporting nicer in at least some cases.