Add some debug to help with #4733.