I'd also take a look at the kill switch and the neutral switch (under the tranny) and insure both of those are dry and clean, too. A little WD-40 can go a long way in an emergency situation.
A positive attitude may not solve all your problems, but it will annoy enough people to make it worth the effort. Herm Albright (1876 - 1944)