How Do You Fix the Best Original Song Race at the Oscars? Eliminate Post-Credits Songs

It might make some great music from big name artists ineligible, but it puts the focus back on using music for storytelling.