"...but I still wished there weren't so many lines and lyrics in the show that conflicted with the circus theme."
Yes, but don't we think that Schwartz, who certainly doesn't shy away from making revisions to his shows, would have changed lyrics to fit the new scenario if he had wanted?
