Code refactoring for the LDAP store.