Update against the latest macaque/pgocaml