Compatibility with Coq trunk