Further refactoring, enabling Drone.io builds.