Note: this commit does just enough so test_formatter compiles and runs
without crashing with the new system.

Test cases will need to be adjusted and other parts of the code might
need to be refactored.