Refactor debug code.
0.8.3