Improve check for identifying underlying block device