Internals: Move some Nav functions and members around (no functional change) + Misc comments
8 files changed