Fixes MapResult and IMapIterator.  Closes #118