Pulled in changes into Z3_Haskell