trace: adapt to clear interface changes