Minor consistency fixes wrt. piyacc.git commit 6558f0b