Further refine build.xml