Further changes based on pull request comments.