Stylistic and doc cleanups.