Conversation so far:

Question: Who did he marry
Self-contained rewrite: Who did Edmund Hillary marry?