Revert "Revert "Even betterer debug info""

This reverts commit 0d6295b999129d5f3a306e045f648fffcc6ec33b.