Back-ported improvement to -debug