Stylistic fixes and such.