Somehow, the reveal that Calvin is a girl.... isn't that surprising once you think about it. An all-female party seems common enough in a fantasy-medieval setting like this.
Why even pull the bait-and-switch? Like, what's the point, what is the gain? It's not a surprise, it doesn't add to the comedy, and I can think of way better characters for fan service.