Post-review fixes to pull request #5203 part 1