Some simplifications in the lexer, type signatures on exported functions in Util, missing withPos calls in the Parser
resolved merge conflict