Bug 895019: Cleanup and make the tracelogger work again, r=jandem