Grammar refactoring: trailing body mark