Misc. Cleanups

Reviews: @vinniefalco, @rec
well, I learned something!

If I were writing this today, I'd use a universal constructor and a map, but this gets rid of the old crap without changing the algorithm.