Leland:
NJ stance on your OP is "NO".
I'll keep it as short as I can....
Panel change falls under 'Rehab" (5:23-6) which presently uses the 2005 NEC as adopted in NJ, which was NO AFCI at all.
Gutting an existing SFD, and rewiring all; NO AFCI required. Doing an addition (increase in structure volume) is AFCI required. Unless, an existing circuit is 'extended' into the addition, then NO AFCI.
Not that any of the above helps in MA, but that's how it is here.
