Replaced more macros.