st.patch: Cleaned it up a bit.