misc cleanup related to id-to-families map stuff