dxgitrace/retrace: A few more cleanups.