First 1.7.2 commit

I should have done this a long time ago, but I'm lazy. :)
Lots of unused classes/code removed, a few new things added, and some
old things done smarter (hopefully).