More deprecations to inform 1.x upgrades.
Merge pull request #861 from square/jwilson_0523_more_deprecations

More deprecations to inform 1.x upgrades.