I just had my recall service done today. The shop said they had to send everything they didn't use (new keys, new tumbler, defective portion of switch) back to Yamaha.
Funny, I dropped it off this morning and asked, "I get the same keys back right?" Service tech said, "Yup, you get the same...