Remove TODO from storage.iterator.