Getting rid of all the TRACE stuff should be addressed separately, I just reindented this line.