Minor Drone refactoring.