Make make driver smarter still.