patched closure-convert.fun and commented out some incomplete code for a shuffle primitive