Style fixes to match mono's guidelines.