Fixed #21361: Made changes requested by Chris Medrela in review.