The core drivers should use the hook as well ;) But your proposal is fine. It doesn't change too much and solves the obvious problem.