This is trivial, but requires changing all `make_fn` callbacks.
This is trivial, but requires changing all
make_fncallbacks.