Cleanup some style-related issues.