Re-enable and clean up the foldl generation.