Move dependent code to a subclass.

Dave Longrequested to merge
issue/drupal-3255804:3255804-subclass into 11.x

Closes #3255804

Merge request reports