Did Bachmann quit making the 40' passenger cars in N Scale?

Most of my cars are 40' or less. Would you use short shank or medium shank couplers?

I wouldn't mind drilling if that's what's needed. But the holes in the trucks look bigger than the pins. A lot of my cars have pins.

Found this place and did some reading. Looks like a great place. So I would like to say hello. My question is easy I think but I can't find the answer. I'm looking at replacing the rapido trucks and couplers on a bunch of freight cars. Some of these Bachmann cars have screws that hold the trucks on and some have pins. I'm looking at the Bachmann #42534 truck and coupler. They appear to have a screw and pin that comes with them. Do they fit both? I know the holes in the trucks are two different sizes. Do I need to drill out the hole some for the one's with the screw or is there and insert for the ones with a pin? I just can't seem to find the answer. Thanks for all you help.