While singing/humming/la-ing Rigaudon in my head today, I realized I would like it just as well if I got rid of the 4-3-2-1 trill and substituted a grace note. So another change to cement into my hands.

Tambourin is actually at speed.  I surprised myself. I'll need to listen to a recording to see if the trills actually come out. Correction: I'll first need to record it, then listen to it.