Refactored parser compiles without errors.