- don't use a typedef with C++11 template angle brackets so that we can still
use SWIG2 (compile file)
- use the prefix iterator (compile fix)