CONN-543: updates per peer review comments.