That would make sense yes. But I would technically see the switch to a
vector done as a separate first step.

I'm really sorry that this pull is again potentially slipping from this
merge Window, it was not my intention.