Update to new macro.