Work around recent Coq bug 3544.