Set trait improvements + minor treemap cleanup

closes #2640 for real this time :wink: