yes, one could imagine doing a bit better, especially since 1.10 is around the corner...