Move NumberOfExprBuilder typedef to ExprFactory