Use non-deprecated macros.