Addresses comments in the GH PR.

This commit will be squashed before merging.