I was so focused on those questions that I more or less ignored the other oddity of the tale - the sudden, never explained entrance of a talking lion. But as I shuffled the lion to the side, he started nagging at me too.
This is the result.
It's an example of how very often, when writing one story, another one appears. At least in my case.