Be careful of what you take off of your car. Arizona is getting ready to enact the much tougher California emissions laws. Without the CFI your car will fail the visual inspection and yes, they know which cars came with it.
http://www.dailycamera.com/news/2008/may/07/ariz-may-enact-new-emissions-rules/
Do they go by VIN? Or do they just know that only the AOD cars came with CFI in '84? Because if I go swapping in a T-5 and they're not comparing numbers, no problemo. As 93LX stated above, they've done the swap in Cali and passed, since carb'ed 5.0's were still available in '84. The main trick I guess would then be to make everything look as OEM as possible, so I'd probably have to stick with a Holley carb with Lokar cable/linkage, a stock 4-barrel intake (the smog-legal Edelbrock Performer doesn't give that much of an increase, anyhow), and a Duraspark ignition setup, and then either hide or remove all the EEC-related crap that I can. (Car isn't equipped with cruise, so I won't be losing anything by trashing it.)
If they get all Über smog-nazi here, hopefully they'll have a certain degree of exemption for older vehicles (like, before '86 or something) ... otherwise I'll be forever limited to 155 horses, because you can't do ANYTHING with a frickin' CFI setup for adding power.

At that point, I may as well just move to Kansas or something.
If nothing else, I could just keep the CFI stuff intact and on hand, in case I need to swap it back. It'd be a far bigger PITA than just swapping on a cat'ed pipe for smog testing, but as long as it's only once every 2 years, oh well ... right?
