Unfreeze debug.adaptor for bug 366315 and code cleanup-up
2 files changed