Cleanup a few things from my inadvertant rebase. Lolz.