Rewrite ant script a little.#2