Okay, comitted the most evil of the changes (check out the 80-some line ChangeLog entry XD). I'm not really done yet, but the remaining stuff is much less likely to cause merge conflicts with anything anyone else is working on.

-mental