Quick pass at instrumentation

BugzID: 24169