Big white-space cleanup.