Good find. Another potential problem that my local dealer put me onto is a blocked fuel tank breather. It will cause poor running and the engine to regularly cut out. It will run OK for a little while and then stop again. On every service on STs now, they squirt a little CRC into the breather pipe and gently blow some air through, watching for a dribble of CRC out the bottom.