Move some deprecations along.
Merge pull request #2642 from jmdavis/deprecations

Move some deprecations along.