Move along some overdue deprecations.
There's no point in scheduling deprecations anymore.

deprecate no longer generates an error, so we might as well just
deprecate directly.