Working through exceptions to finish the conversion to treemaps and
treesets.