Fix up style issues to make tailor happy.