Clean up pass for s_all.