Minor cleanups in ant build file