Modify PrimaryExpr's constructor