I don't disagree, but can we do that as a later pull request? :-)