Plus, as I write him, Kage can be very dense about stuff like that, even now. And yeah, I assume the comedy sidequest did happen. Not quite as we see them, but the events did occur.
And the idea of the Queen still pursuing Kages connection to her daughter, even when told otherwise, is just too...