DebugInfo: Random tidying up/simplification

No functionality change intended.