Updating: improving contrib/cairo.