Samplers now generate a single sample set; also get rid of TraceM (and other tweaks)