Updating: tidying up cairo-API