Merge pull request #3466 from eileenmcnaughton/code-tidies