Preprocessing to be compatible with Coq trunk