Move make_fn() out into its own file.