Get rid of macro deprecation warnings.