Mathewpeterson/add more deprecation

@dianakhuang @dmitchell @cpennington Review?
s/an/a/