More incomplete tracelib changes...