Cut down on a number of 600ms core nav load times I was seeing....

...  Now consistently 100ms range [#83969142]