CXX-189 review fixups