I've toggled the default "Quit Safari" to "Quit and Discard Windows". What was really nice about this was that by changing the key combos for both (in System Preferences), Safari now shows quit and discard as the standard item and you have to hold down the option key for quit safari.