Raise up interface requirements for lexer utils.
Clean up whitespace.