Move definition of s_\omega, use in a few more places