cleanup.  mapType now done 'breadth first' instead of 'depth first'