Let's try to keep stylistic changes to the minimum so the pull request stays to the point.

Also, we try to follow [Mono Coding Guidelines](http://www.mono-project.com/Coding_Guidelines) except that we use 4-space spaces instead of 8-space tabs, so `{` should be on the same line.

Can I ask you to reformat all changes to put `{` on the same line, put a space before the parens and brackets, like in the rest of the project?

You can set XS to do this automatically btw.