Ah, I always was quite suspicious of the Ocarina of Time overworld music getting calmer when I stood around but never got past the doubt that it might have been coincidental until now.
Also, it took me until SM64DS to notice the instrument additions in the SM64 water theme as you move about.
This reminded me how delighted I was with the way the Twilight Princess Castle Town band's music meshed into the actual music.
Thing to note: Kondo composed the overworld theme of NSMB! I knew it was suspiciously catchy.