Cocktail's base spirit parsing updated