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