The spoiler thing didn't work, by the way. I agree there are tons of loose ends to Tokka - I think if it were to happen it would be years later, maybe even after Lin is born. I'm more inclined to believe they're dropping hints that it might happen as a wink and a nod to Tokka fans rather than truly intending to follow through on it (at least at this point in the timeline).