Rename struct trace to make its role clearer in the face of upcoming new types