Going to issue a pull request on this, see where the conversation leads
us.