Not used.
Fixed up some stuff since the broken Resolver/Uri transition.
InstanceState initialization a bit cleaner. Multiple methods that