Another case for a modified defaultdict.  #199
Merge branch 'issue199' into devel