That would be a nice change actually, it seems fairly nicely separable from this change, however, so I think I'd attempt to do it in a later commit.