Use the new versioned macros instead of the generic ones.
This requires some minor surgery in the build to disable the deprecation warnings in the deprecated classes.