Decided to defer some changes to the Lexer until they are actually needed and I have an actual use case.