Small changes involving func_t and concrete_func_t.