Additional streamlining of build.xml