[unrelated] Clearer debug aids/declarations
4 files changed