ENG-4155: Perhaps address pmartel feedback.