Upgrade core-rewriter mixer
More changes to the header