Fix comments from PR #6204.

#6199 

This is a followup to PR  #6204 and address the comments in that PR.