WIP: pursuing deprecation warnings some more