[jariel]

I tend to agree.

To me, this is a good fit for some kind of 'fairly simple abstraction' - even the abstraction used is fine.

So long as everything worked, I think this might be a better solution.

I'm fine with 'don't just refactor because' but this looks like a fairly clean cut opportunity.

Social considerations aside.