Some parser path cleanups and tests