Merged in changes to lexer and productions, maybe parser, rhs.  Moved some functions around functions around to match 9.4 in other filse.  Passes unit tests.