Some style fixes to make things line up better.