Merge pull request #8125 from lioncash/verify DiscIO/VolumeVerifier: Make use of unused variable (+ minor other changes)
