minor cleanups to recent STL utilities / deprecation usage