Cleanup some generics and some redundant Flag options
ISPN-3592 Avoid the DirectoryImplementor list() method to return null elements in the returned array