CXX-191 more comments