Clean up parser errors.

@bug W-2124278@

@rev fabbott@
Revert visibility changes to fix compile errors.
Merging origin/goliver/master-pending-parser-cleanup into master