Would be good to submit this upstream; pretty heavy for a single formula.