Fix up build.xml some more.