Need reviewer: corba changes for build infra

[Tim Bell]

> This is all as expected, although perhaps questionable style.
>
> Given Fredrik's comments too, are you ok with the changes?

Thanks for the back-story on this corner of  the build.

I am fine with the changes.

Tim