Address a deprecation warning.
Clean up a few odds and ends.