diff --git a/modules/juce_audio_devices/native/juce_win32_Midi.cpp b/modules/juce_audio_devices/native/juce_win32_Midi.cpp
index 771cdb7762..ca5a43cec6 100644
--- a/modules/juce_audio_devices/native/juce_win32_Midi.cpp
+++ b/modules/juce_audio_devices/native/juce_win32_Midi.cpp
@@ -26,7 +26,6 @@
 class MidiInCollector
 {
 public:
-    //==============================================================================
     MidiInCollector (MidiInput* const input_,
                      MidiInputCallback& callback_)
         : deviceHandle (0),
@@ -44,8 +43,7 @@ public:
 
         if (deviceHandle != 0)
         {
-            int count = 5;
-            while (--count >= 0)
+            for (int count = 5; --count >= 0;)
             {
                 if (midiInClose (deviceHandle) == MMSYSERR_NOERROR)
                     break;
@@ -56,11 +54,12 @@ public:
     }
 
     //==============================================================================
-    void handleMessage (const uint32 message, const uint32 timeStamp)
+    void handleMessage (const uint8* bytes, const uint32 timeStamp)
     {
-        if ((message & 0xff) >= 0x80 && isStarted)
+        if (bytes[0] >= 0x80 && isStarted)
         {
-            concatenator.pushMidiData (&message, 3, convertTimeStamp (timeStamp), input, callback);
+            concatenator.pushMidiData (bytes, MidiMessage::getMessageLengthFromFirstByte (bytes[0]),
+                                       convertTimeStamp (timeStamp), input, callback);
             writeFinishedBlocks();
         }
     }
@@ -69,14 +68,14 @@ public:
     {
         if (isStarted && hdr->dwBytesRecorded > 0)
         {
-            concatenator.pushMidiData (hdr->lpData, (int) hdr->dwBytesRecorded, convertTimeStamp (timeStamp), input, callback);
+            concatenator.pushMidiData (hdr->lpData, (int) hdr->dwBytesRecorded,
+                                       convertTimeStamp (timeStamp), input, callback);
             writeFinishedBlocks();
         }
     }
 
     void start()
     {
-        jassert (deviceHandle != 0);
         if (deviceHandle != 0 && ! isStarted)
         {
             activeMidiCollectors.addIfNotAlreadyThere (this);
@@ -112,14 +111,15 @@ public:
         }
     }
 
-    static void CALLBACK midiInCallback (HMIDIIN, UINT uMsg, DWORD_PTR dwInstance, DWORD_PTR midiMessage, DWORD_PTR timeStamp)
+    static void CALLBACK midiInCallback (HMIDIIN, UINT uMsg, DWORD_PTR dwInstance,
+                                         DWORD_PTR midiMessage, DWORD_PTR timeStamp)
     {
         MidiInCollector* const collector = reinterpret_cast <MidiInCollector*> (dwInstance);
 
         if (activeMidiCollectors.contains (collector))
         {
             if (uMsg == MIM_DATA)
-                collector->handleMessage ((uint32) midiMessage, (uint32) timeStamp);
+                collector->handleMessage ((const uint8*) &midiMessage, (uint32) timeStamp);
             else if (uMsg == MIM_LONGDATA)
                 collector->handleSysEx ((MIDIHDR*) midiMessage, (uint32) timeStamp);
         }
@@ -299,15 +299,8 @@ MidiInput::~MidiInput()
     delete static_cast <MidiInCollector*> (internal);
 }
 
-void MidiInput::start()
-{
-    static_cast <MidiInCollector*> (internal)->start();
-}
-
-void MidiInput::stop()
-{
-    static_cast <MidiInCollector*> (internal)->stop();
-}
+void MidiInput::start()     { static_cast <MidiInCollector*> (internal)->start(); }
+void MidiInput::stop()      { static_cast <MidiInCollector*> (internal)->stop(); }
 
 
 //==============================================================================
@@ -369,31 +362,28 @@ MidiOutput* MidiOutput::openDevice (int index)
     const UINT num = midiOutGetNumDevs();
     int n = 0;
 
+    for (UINT i = 0; i < num; ++i)
     {
-        for (UINT i = 0; i < num; ++i)
+        MIDIOUTCAPS mc = { 0 };
+
+        if (midiOutGetDevCaps (i, &mc, sizeof (mc)) == MMSYSERR_NOERROR)
         {
-            MIDIOUTCAPS mc = { 0 };
+            // use the microsoft sw synth as a default - best not to allow deviceId
+            // to be MIDI_MAPPER, or else device sharing breaks
+            if (String (mc.szPname, sizeof (mc.szPname)).containsIgnoreCase ("microsoft"))
+                deviceId = i;
 
-            if (midiOutGetDevCaps (i, &mc, sizeof (mc)) == MMSYSERR_NOERROR)
+            if (index == n)
             {
-                // use the microsoft sw synth as a default - best not to allow deviceId
-                // to be MIDI_MAPPER, or else device sharing breaks
-                if (String (mc.szPname, sizeof (mc.szPname)).containsIgnoreCase ("microsoft"))
-                    deviceId = i;
-
-                if (index == n)
-                {
-                    deviceId = i;
-                    break;
-                }
-
-                ++n;
+                deviceId = i;
+                break;
             }
+
+            ++n;
         }
     }
 
-    int i;
-    for (i = MidiOutHandle::activeHandles.size(); --i >= 0;)
+    for (int i = MidiOutHandle::activeHandles.size(); --i >= 0;)
     {
         MidiOutHandle* const han = MidiOutHandle::activeHandles.getUnchecked(i);
 
@@ -407,7 +397,7 @@ MidiOutput* MidiOutput::openDevice (int index)
         }
     }
 
-    for (i = 4; --i >= 0;)
+    for (int i = 4; --i >= 0;)
     {
         HMIDIOUT h = 0;
         MMRESULT res = midiOutOpen (&h, deviceId, 0, 0, CALLBACK_NULL);
@@ -455,14 +445,12 @@ void MidiOutput::sendMessageNow (const MidiMessage& message)
 {
     const MidiOutHandle* const handle = static_cast <const MidiOutHandle*> (internal);
 
-    if (message.getRawDataSize() > 3
-         || message.isSysEx())
+    if (message.getRawDataSize() > 3 || message.isSysEx())
     {
         MIDIHDR h = { 0 };
 
         h.lpData = (char*) message.getRawData();
-        h.dwBufferLength = (DWORD) message.getRawDataSize();
-        h.dwBytesRecorded = (DWORD) message.getRawDataSize();
+        h.dwBytesRecorded = h.dwBufferLength  = (DWORD) message.getRawDataSize();
 
         if (midiOutPrepareHeader (handle->handle, &h, sizeof (MIDIHDR)) == MMSYSERR_NOERROR)
         {
@@ -489,7 +477,6 @@ void MidiOutput::sendMessageNow (const MidiMessage& message)
     }
     else
     {
-        midiOutShortMsg (handle->handle,
-                         *(unsigned int*) message.getRawData());
+        midiOutShortMsg (handle->handle, *(unsigned int*) message.getRawData());
     }
 }