(#51) Further refinement to volume state handling.