(MSVC 360) Down to 36 errors now