Remove uses of deprecated macros