Various changes working toward being able to automatically merge brushes that can be merged.