Agree on this one as well. However, one of the things I would hand to a followup issue, to keep PRs small and get this one into the master to base other work on it.