Address @pelson's comments in the PR.