The mere fact that they have the falling whale is brilliant, I thought scenes like that would be dropped in a heartbeat. The ride though the planet workshop looks spectacular.
Having said (typed?) that, this is only the trailer, so may not actually appear in the released movie at all.

I notice that you can now get the TV show on DVD now. I'll have to be getting that....