Done! Made the pull request a bit longer to read though...