Loaded the ol' codebase into Visual Studio and ran a bunch of clean up on it. Eek. But it seems to be working.