starting to make consistent with coq trunk.