So...

[GonzoStyle]

They just could have had a scene where Indy goes back to his house, and finds Shortround dead, with a note from Donavan saying "Come meet me; it's about the Holy Grail." And that would explain so much.

yeah that woulda been uber gay.