Add types to containers and/or iterators
move() shouldn't throw away MapException