Work on refactoring init_fn stuff.