Made changes resulting from simplifications with the JUCE version.