SERVER-10471 more comments based on review