Re: winemaker: Be less picky when detecting the target type