Larry, yes that will obviously work, whether you wish a use fill to improve the subjective effect of the transition to the repeat or not is immaterial, I have used the first measure of the ending in the past which often provides a pleasing subjective outcome. Glad my method works for you.

Bob, you may have been talking about Larry’s song, but no one mentioned keeping control events until you brought it up late in the day. If you would have said that in the first place then I could have described the final solution immediately. I have no problem with fixes to software, I merely took issue with your obviously incorrect statements about required button pushes.