My high school friend,         I haven't seen for 20 years, is no longer ____ he was. [ ]

A. who, that

B. which, that

C. whom, what

D. that, what