fixes in SDF3 grammar