Replace more driver_funcs macros