I find that the shift button goes into shift-lock mode too easily. The most frequent time it happens is when I press shift+F1-8 to trigger one of my macros or shortcuts, and then I go to press Track or some other button only to realise that shift-lock was activated when I triggered my shortcut.
Perhaps the simplest update would be that:
if shift lock disabled
shift held down and function button accessed
do not enable shift-lock
To me shift-lock should only ever activate when I manually and only press and release the shift button without pressing any other buttons.