Lots of commits today, huh?

Wow. I keep forgetting things.