Clean up warnings from s_all.