The trap episode two back is definitely Admiral Ackbar from Return of the Jedi. Sadly, I knew exactly who it was, and still didn't understand that joke. If I weren't in Dark Legacy, and able to ask around, I probably still wouldn't have realized it. (I really need to go back and see Episodes 5 and 6 a second time some day.)
But yes, this was definitely Keydar at his finest.