Better [nav] logging; simplified underscore logic