Cleaning up mapstack::iterator. Factoring const/non-const iterators.