Merge "Fix the duplication in the debugging code."