Changed all CVC4::Expr to Expr