use an EnvironmentTarget helper instead of direct isinstance checks

use an EnvironmentTarget helper instead of direct isinstance checks #24446