Touch up make_fn a little bit.