Clean up some access to null objects in the demo.

just moved stuff around to quiet error messages.
This is still a bit messy.  Really QML likes to use Loaders for this sort of thing, but in our case the page transitions are cached.  Maybe they need to be dynamic with a loader.  Let me try that.