Thanks for grepping ;-) OK, then how about Andrew G's suggestion? Or (if we're only using this in tests) simply keep things are they are? Then we don't have unused-other-than-in-tests code in the core...