More pattern cleanup

Hope I didn't break anything...