Also factoring out the coq term types using an overlay.