It's also possible to switch the default so that Cmd + q will quit and keep windows, while Cmd + option + q will quit and discard windows. I like it this way much better. I have it set up for just Safari however.