I laughed at him needing to scratch an itch but completely missed the NBC shot, that's great.They certainly left it open for him to come back if the need or opportunity arises.
I also loved the little dig about needing a dead peacock feather to scratch an itch that had been bugging him. Silly NBC
Kinda wish they had done a bit more of the scooby doo gag when they were in Sara's soul prison place though even if it was just Laurel running around like an idiot.