As the logic in AddStepHandler grows, it needs to be duplicated by BoottimeAddStepHandler, since BoottimeAddStepHandler extends AbstractBoottimeAddStepHandler. To simplify maintenance of these classes, we should have BoottimeAddStepHandler extend AddStepHandler instead, and reimplement the logic from AbstractBoottimeAddStepHandler.