Issue #39: Now using macrodef ant task more effectively