Some clean-up changes in response to PR comments.