Clean Up

[billroper]

I cleaned up a bit of work that needed to be done (perhaps not by me, but it was in my way), then cleaned up some work that needed to be done by me (because I'd broken it, although not in a terrible way). I am now in a position to do some work that is, overall, more vital.

Which is an improvement. :)