More cleanups for new parser, some more to come