assorted iterator/container cleanups