Always with yarn because it also helps with thin manes and flyaways.... and we used a saddle butter with wax in it. Would grease the flyaways down but dry kinda waxy and not attract dust like oil would.
The Braid Aid is essentially industrial strength Dippity Do. It sticks down the flyaways too (and Gracie has a lot of them).
Well, it's school again for everybody in the morning, and work for me, so I guess I better get to bed. 'Night, all.