Yeah, that would work. A PITA, though. I'd want to collapse them for v4.0.