Fix complaints from s_style.