Miscellaneous cleanup

Build was broken and a test was failing on my machine.

You might want to go over the entire codebase and initialize all uninitialized local variables. Otherwise we're basically playing russian roulette :)