changed expr to CVC4::expr in typedef