Brings path tracer into line with 913f803.