commit: Take out some debug code; correct some original code.