Lots of StyleCop fixes.
More StyleCop fixes.