Minor clean-ups.
Introjucer: saving swatch colours.
Minor clean-ups.
WASAPI compile fix for vs2008