Fix a regression where notes got somewhat lost, and also that the new
default envelope behavior wasn't quite a 1:1 match of the old behavior
before the new switch control was added.