Kill-Switch Causing Fi Light Warnings And Random Engine Cut-Outs (5Th Gen 2000)

First it was my clutch switch, now this.

I'm assuming i'll just need to disassemble and clean the kill-switch assembly, right?

Symptoms:

• Any touching AT ALL of the kill-switch cuts the engine, even pushing it down to on, while on.
• Will occasionally cut the engine and the FI light comes on - Have to turn the bike off for 30+ seconds to resolve this.
• If kill-switch is used; FI light comes on as above.

Well that's certinly where I'd start, given those symptoms.

I guess i'll go into the shop on Monday and pull it apart. Having workshop access is brilliant.