I think the Building Dept. sees a way to back out of their original compromise and I hate to say it but I think they should.
518 covers places of assembly but 520 more specifically covers Audience areas and there is just no leeway for NM in any application in these areas.