Make parser less wonky