I'll raise a PR against this as it's not that straight forward.