Some cleanup, a bit more speedup

git-svn-id: https://svn.apache.org/repos/asf/directory/apacheds/trunk@1485193 13f79535-47bb-0310-9956-ffa450edef68