Update after code review changes.  Parser state change.  Reran unit, int, and qual tests.