proposal v7 grammar fixes