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