r23058: the cldap code was getting too intimate with the internals of struct