two more optimizations by Adrian Nistor I overlooked

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@1554830 13f79535-47bb-0310-9956-ffa450edef68