Rename type_ptr to object_ptr, Windows-specific changes.
Upgrade test-cpp with fixes for VS.