Mild improvements to parser