Small cleanup of NavTabsHelper