Cleanup in acl.tools and streamlining in acl.parser