JAVA-981: Third response to Trisha's code review comments