Maybe both Sam and Dani could wear Angela costumes?

Andy is probably reluctantly resigned to not harassing/hugging Callie after Tiri's little speech. And so the bard, for once, hangs back.