Detangle a bit, and be a bit more discerning about what we push through fmt/1.