Debugging adjustments. No functional changes.