This also fixes the case where the building palette doesn't match the indicator, and saves 2 trait lookups per tick.