ok matthieu@
Tested on a bulk ports build by naddy@. Lots of churn due to white-space and comments changes in generated code.