Here's just a bunch of misc cleanups... Nothing really functional, just makes the code a bit cleaner, I think.