c++: Follow module grammar more closely [PR110808]