Making the extra-spec handling in Volume Types more robust.

Was a little presumptive before, now it has explicit checks for
things existing.