changed all expr to CVC4::Expr