Various style tweaks and reorganizations.