MDL-38538 implement Andrew's peer review comments.