Cleaned up the DistinguishedName composition logic.