Conversation so far:

Question: What charity work did he do?
Self-contained rewrite: What charity work did Ian McKellen do?