Fixes for handling complex repository dependency definitions in tool dependency recipes.