Cleanup tracing logic, trace function parameter assignments.