Clean up TODO.
Use the new logging facility.
Print context tree dump on separate line.