Seems like a reasonable re-factoring that I can file an issue for.