I spoke too soon about not having to replace anything.
I thought I would spend a leisurely morning out in the sunshine putting all my screen trim back on, and that all went fine. Then I opened the bonnet to refit the screws on the scuttle trim panel and found that the clumsy b**ards have broken it. This was the only panel I left in place before I took it for the screen fitting! A heated phone call and revisit later I now have to wait for the Auto glass manager to assess the damage on Monday. And people wonder why I never let anyone work on my cars...