Add comprehension and map versions of functional_files