Fix some space-wasting in the Parser