Remove redundant tests for deleted traces, and rearrange comments and factory calls...