Minor refactoring in Midi to Control path

Sorry for this merge request, but it was intended as master commit onto your incidentally merge. 
I just do not want to loose it.