Move deprecation warnings into the right place.