(a) Small changes around iterators and stamp manager.