Make small improvements to Parser