Incorporated parser code review fixes.