I'll have to create a completely separate execution path to support contextual loading which will lead to greater maintenance cost since there will be what is effectively a run and run_parallel method instead of handling everything in the run method.  I'll commit the changes in as surgical a fix as possible in case you decide that the approach is not as good.