minor changes: preparing for Parser.y.pp hacking