Misc. Cleanups

Reviews: @vinniefalco, @rec
Huh?  Why does this go, did I miss something?