7.x grammar fixes

The first of many incoming