Adapt (again) to latest polyproj branch of mattam82/coq.