I agree wholeheartedly about the optimisation, but is it worth holding it for another PR @rhattersley?