Switch (non-scalable) Bag to IntMap.  Fixes #53