Improvements to last commit following pull request review.