There are formatting problems here and lower down. It's certainly due to me using XCode to edit the file, and not paying proper attention to whitespaces. I'll fix before merge.