Can we disassociate PendingStepStrategy and FailureStrategy please (and impls)

There is no benefit from a usability POV for them being part of the same hierarchy. In fact its difficult to explain to newbies why that needs to be the case. In code there's only StoryRunner that holds on to three ThreadLocals:

private ThreadLocal<FailureStrategy> currentStrategy = new ThreadLocal<FailureStrategy>();
private ThreadLocal<FailureStrategy> failureStrategy = new ThreadLocal<FailureStrategy>();
private ThreadLocal<PendingStepStrategy> pendingStepStrategy = new ThreadLocal<PendingStepStrategy>();

.. which is also hard to explain why.