Redid TraitFluids as well.