I agree, however if you look at tony's code, that enhancement would be required in _many_ places.  It'll wait for another PR rather than clutter this already bloated one.