Addresses comments in the PR.

This commit will be squashed before merging.