small cleanups to NavigationHistory
more small cleanups to NavigationHistory
fix another E_NOTICE in NavigationHistory