Swap definitions to follow proposed style more closely.
Better do it in post-build.