Sounds reasonable. What do people think of this for C++? I'd like to have one phrasing for both headers and .cc files. There's no special benefit in uniformity for this, so I wouldn't strain the wording just for the sake of uniformity.