Replaced a bunch of things that were formerly done by stuff inside functions-*.cfg.