Remove legacy -uncurried flag and some leftovers
#8201
+6
−23
Merged
Loading