Fix more deprecations.
Merge pull request #171 from csmith/master

Fix more deprecations.