Merge "Clarify comment on tombstoned exception."