Updated to using the new re package and updated lexer package.