Port to the new syntax

I'm not convinved that the old macro wasn't nicer, but well...