Move things around to reflect the fact that we are now
in 1.47, and use our deprecation macros.