Kinky pipe - water in the spare wheel well

Just in case someone else suffers with this:

Our car was recalled for pano roof drain issues and yet still suffered with this common problem. The spare wheel well filled with water, and I started removing trim at the bottom and working my way up... When I got to the roof lining, I found that the pano roof drain tube had a kink in it that blocked the water from draining away. I found a tight-fitting spring that I slid over the pipe that kept the pipe from bending and job done.  (Apart from drying out then reassembling the boot trim and wheel well liner.)

Hope this helps others with the same problem.