Better file handling in trace.