Updated per Ryan's pull request comments.