And now the real fun begins. This series translates the text formatter into the new format style in two steps: the first patch is a big diff but just shuffles code and the second actually takes advantage of the new structure. This incorporates Dmitry's comments on the RFC patch series from id:87lioxna2n.fsf at gmail.com .