Improved tracing: dump nodes too