Make debug values match structure elements.
Minor fixups; no change to logic.