Cleaned up the ant xml a bit.