Dang it, ⌘-q is just to close to ⌘-w and I still occasionally quit when I want to close.