I just picked up an oil pan and pickup from a 98 Mark VIII (yes I searched). I didn't know they had so much internal baffling already. Are they all like this? I know the 97~98 had the larger diameter pickup tube. It looks like if I used it in conjunction with the Canton windage tray, one or the other is going to needing a trimming from the grinder.