COOK-3273 updates per Seth's inline comments in pull request.