Address @mheilman's PR review comments.