a bit more work on migrating oldmap to the core::container::Map API