(new:minor) Changes to subset_traits