Generate closures rather than bare fns