a few syntax changes in parser / printer