Agree, it seems odd and brittle. Not really part of this pull request of course.