gh-146175: Soft-deprecate outdated macros; convert internal usage

gh-146175: Soft-deprecate outdated macros; convert internal usage #110151