A few style tweaks and fixes.