superenv: move check logic into superenv?