Fix defect hiding lost artifact digging info, clean up & comment code.