I do not fully understand your commend. It is like that started from the initial version. 
I also not understand the comment below: 
> // looking for NOTE_ON doesn't seem to work...
Can you explain or provide a patch?