Re-factor and deal with volumes that have multiple mountpoints.