Minor cleanup of navutil.