Follow-up to r64478 - pull out debugging code