View Navigation: cleanups

(I thought Campbell has committed something related to that, but it may
have been lost during my rebases)