Merge "Fix one last use of TRACE()."