Update to compile with the last trunk of Coq