A quick discussion with my Fire Official results in:
Yes, the smokes on a circuit with a light (luminaire) WAS the chosen way, back 20-25 years.
NOW, a dedicated circuit is required. It's in "72", but neither one of us has the time to hunt it down.
BTW, Bob has 40+ years in Fire.