Mark issues #2240 (wording only) and #2268 (revision 202876) as complete.