I thought I'd committed these changes to 'windows+cc' but I must have forgot....