Code cleanup for the debug information patch.