These are some changes I made at some point in the past but never committed. They're probably crap. Oh well.