PJSM-247: Consider reviewer feedback.