Fix various deprecated uses.

Change-Id: I0bb97a8946d1c217de82fe2a9b8f35b7d49eae06
Merge pull request #210 from csmith/master

Fix various deprecated uses.