Cleanup pass

Some cleanup to mark the finish of the new Parser and prepare to update
the processor for the new structure.