Merge branch 'coq-extraction-baked-in' of /afs/megacz.com/pub/software/coq-hetmet