Replaced more macros in the ntsc module.