Add calls to curry and uncurry.