Replaced more macros.
Replaced more macros.