Distributor question

[BarracudaBoy]

I thought this thing was supposed to have a short shaft that fits into a notched longer shaft. What do I have here? I pulled at it, but it looks like it's pinned at the top. Thought I would ask the gods of fordbarn before I break out the punches.

Also, what's the trick to getting the oil pump/distributor gear out of the block? I removed the spring and lifted it up, but it seems to long to get the clearance needed to pull it free. Maybe I'm holding my mouth wrong.