I'm really really really hoping they don't stretch out that last scene and what he shouted to be everyone thinking he was talking about the baby, before the story gets around to what he was really talking about.

I have a feeling they might do that. The confusion could serve as a convenient plot device. And while I really enjoyed it, it had a slow start through the first couple of episodes so, to me at least. So capitalizing on the confusion for an episode or 2 seems like it's right up their alley.