Q and 1 are Too Close Together

In many Mac applications, Command-1 switches windows. In Mozilla, it brings up the browser (as opposed to Mail or IRC) windows. It gets used a lot. In almost every Mac application, Command-Q shuts it down. "Q" and "1" are way too close together on the keyboard, sigh.