Conversation so far:

Question: Did he have his affairs in order
Self-contained rewrite: Did Edward Canby have his affairs in order