Handle switching system datasets (and the encrypted pool case) better