Revert "Remove debugging code."

This reverts commit 7b8707017b2c7f69cbed794c8e5df88909879dc3.

This code is going into the experimental branch.
Revert "Distribute formatting decisions among different containers."

This reverts commit b31ac638578ffb9da193bbb71d2092ad66928cc0.

This code is going into an experimental branch.