Fixes for compilation with Coq 8.6.

1 job for master in 8 minutes and 55 seconds
Status Job ID Name Coverage
  Test
passed #703
coq
buildjob

00:08:55