Remove some duplicate trace code.