Revert "More style refactoring."

This reverts commit e3c4f88d4e09f443d9066038b2d4a1084ec30534.