Move some deprecations along.

Ah I see. Makes sense.