reverts "replaces Member.ref with Member.typeRef and Member.Term.termRef"