So having replaced the clutch and put everything back together, everything is fine. Nearly.
I have had two issues, one of which I have fixed temporarily. The bike cut out, and ground to a halt in a lake of fuel. The quick release fitting on the tank spigot had let go. It would go back on with a click, but then just slid off again. So I cut it off, and bridged the gap with some hose and two jubilee clips. Happy days.
The other issue is that the fuel warning light does not work. All the wiring seems to be connected correctly. But it got to very close to running dry a couple of days ago, and it didn't come on.
Any thoughts about what may have happened, and how I isolate the fault?