Oops, over-eager optimisation