make the code work either with patched coq 8.3 or with patched coq 8.4