Minor tidying.
win32 multi-touch fixes