Only unwrap command lists at the level we need

* This prevents us from accidentally unwrapping at List2 level when List2 might
  not be available, and we only need List.
* If we need higher list levels we can unwrap explicitly, and it's clearer that
  it needs an availability check.