Get rid of more driver_funcs macros