The new syntax is much better - get rid of the old one.
Split out common bits for another util