Mathewpeterson/add more deprecation

@dianakhuang @dmitchell @cpennington Review?
This needs to pass `deprecated` along as well.