o Minor features: - Improve debugging output to attempt to diagnose the underlying cause of bug 8185.
