Hey.. You were worried 'bout performance.. :).. No, without kidding, I think its a good idea. Could we take it in a separate pull request (e.g. extending this solution)? Although the impact in source code is probably limit (just as this solution), I would like to spent some more effort on testing in that case.

Perhaps its a good idea that somebody other than me writes tests as well (independent view) since our tests are more functional than true 'unit' tests (with a class scope)