Marc:
I can tell you the NJ scenario, but Wi may be different.
What you are proposing to do in NJ would fall under our 'Rehab' section of the UCC (Uniform Construction Code, as follows:
You are reworking existing circuits.
'Existing' is under 'Rehab'
'Rehab' is based on the 2005 NEC here, until the State updates the 'Rehab' section of the UCC.
We (NJ) did not require AFCI under the adopted version of the 2005 NEC.
Best suggestion is talk to the local (Wi) AHJ before you get into it.
Take care & travel safe.
