That's were I'd love anaphoric conversion. Will commit your version instead of merging 3 commits.