It's kind of a "duh" spoiler, not something I'd say that really needs fixing. In order to not make it obvious you'd have to change more than just the ending.
I disagree. With Azure, you could cut a few minutes off the ending and it would be much better and less spoilery. ---