Misc changes. Blah. Haskell.

I swear, I'm usually not this bad with Git...