Improved d&d tracing.

Leo build: 20141007225832