More motor driver refactoring.