Refactor, to make the shiny new Ant build script work...