           if(grid[x] & mask) { // Already set?  Turn off...
             grid[x] &= ~mask;
             untztrument.clrLED(i);
-            usbMIDI.sendNoteOff(pgm_read_byte(&note[y]),
-              127, pgm_read_byte(&channel[y]));
+            noteOff(pgm_read_byte(&channel[y]), pgm_read_byte(&note[y]), 127);
           } else { // Turn on
             grid[x] |= mask;
             untztrument.setLED(i);

    line(col, false);
    for(uint8_t row=0, mask=1; row<8; row++, mask <<= 1) {
      if(grid[col] & mask) {
        usbMIDI.sendNoteOff(pgm_read_byte(&note[row]), 127,
          pgm_read_byte(&channel[row]));
      }
    }
    // Advance column counter, wrap around

    line(col, true);
    for(uint8_t row=0, mask=1; row<8; row++, mask <<= 1) {
      if(grid[col] & mask) {
          noteOn(pgm_read_byte(&channel[row]), pgm_read_byte(&note[row]), 127);
      }
    }
    prevBeatTime = t;
