Improve the debugging of the auto-remove code.