Make the new formatting process work and tests pass.