Yes, plawrence, this must be the one. I've read posts where members have mentioned an "early draft" of the GF2 script, which indicated that Fredo thought the Tahoe plot was going to be a kidnapping. I never knew this draft was on the internet though, until I happened upon the
imsdb.com web site by chance.
In fact, the omissions I posted above just scratched the surface. The scene of Connie and Merle being relegated to a 3rd class cabin on the Queen after Michael closes Connie's bank account is indeed in that draft as well. Prior to that, Connie and Merle had left for Las Vegas on the night of Anthony's party, and were married at a "24-hour" wedding chapel by a J.P. So now I know it's less likely that Connie opened Michael's drapes that night

.
Also, Geary became indebted to the Corleone family not via a dead prostitute but by the Corleones taking it upon themselves to pay his gambling debts -- and then some. We also see Tom's relationship with Sonny's widow, Sandra, in whom he confides his worries about Michael seeming to need his help less and less.