Removed automatic generation of composite references.  That was creating problems when only referencing part of the identity.