(bug 5147) Fix style-related problems