Update for latest GMP-API changes on m-c.