This is a big and painful change. I'd suggest to either drop it for now or convince Bjorn to take it as a scripted renamed just after -rc1.
This is a big and painful change. I'd suggest to either drop it for now or convince Bjorn to take it as a scripted renamed just after -rc1.