Comment by jacquesm

It might be worth extracting it back out, it seems pretty useful.