Fixing router bug with non-activatable screen, with no previous route.

Some router internals cleanup.