Merge pull request #3265 from JosJuice/volumedirectory-simplifications DiscIO: Small VolumeDirectory simplifications
