Rewrite more driver_funcs macros