Switching to one-pass parser. Draft.
More cleanups for one-pass parser.