I feel your pain, Vin. As a reformed English major, stuff like that always sticks out. Kind of like now that I'm a graphic designer, it bothers me to see anachronistic fonts used in films set in the past!
The most frustrating example for me was always "If You Were A Woman And I Was A Man." That one always drove me up the wall because it starts correctly but ends incorrectly! But I must say it does sound better. Somehow, "If You Were A Woman And I Were A Man" just sounds wrong.
It's times like these you have to just say it's only rock & roll, but I like it!