That's always been a weird sequence in the film. However, when you see Frank and Jill in bed, aren't they at his hideout?
Also — there is foley throughout the end title in the clip posted above.
As much as I love “Farewell To Cheyenne,” that clip seemed like a more natural end to the film than the version I'm familiar with (it's also not a reprise of the exact same cue that you just heard three minutes ago).