oldmap: make remove use explicit self and &K