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