Some cleanup of NAV_SVINFO message handler