5.2 updates.

Most changes are cosmetic in nature.
The navigation plugin is a dropping ground for direct navigation code.
Some fixtures have been moved up to top-level for all to use.