Convert the rest of the stuff from macro to dmacro
Convert the rest of the stuff from macro to dmacro

olabini/ioke,bculkin2442/ioke,bculkin2442/ioke,bculkin2442/ioke,bculkin2442/ioke,bculkin2442/ioke,olabini/ioke,olabini/ioke,olabini/ioke,bculkin2442/ioke,olabini/ioke,bculkin2442/ioke,olabini/ioke