Change Lexer API

Fixes #100

DCD continues to build with these changes. I guess it never touches the lexer.