Various changes for in-tree cairo