Addressed review feedback.

To be squashed.