Changes to Coq2Scala