Small clean-up of the 'Dumped variable' code...