Although I maintain he should've gotten hit by a golfball in the end there... All the setup was there. It could even have been an end credit scene. I mean, his mentioning Elrond was proof enough that they didn't take themselves too seriously... It could've been so easy. 🙈
