Rewrite rerunningIngredients to be [Ingredient] -> Ingredient

This allows the TestTree to be filtered once, and various Ingredients
now all get to operate on the filtered TestTree.
-Werror -Wall