I'd actually prefer to both broaden the scope & make them more stringent at the same time. The way they wrote the law here you can't carry where alcohol is served. This includes restaurants that mainly serve food.

My preference would be that 1. Make the CCW qualifications more difficult, 2. Allow ccw anywhere except inside a courtroom with the requirement that if you carry you or maybe your party DO NOT drink

Or make a distinction between bars & restaurants with the requirement that if you CCW you DO NOT drink instead of #2.