Adjustments from feedback on pull request.