I am an electrical inspector and I would require afci's The rule of thumb is what ever you pull apart has to go back together with today's code as if it's new construction

"Live Awesome!" - Kevin Carosa