Working towards support for local schedulers.  This commit causes a performance regression in some of the benchmarks.  Will tune implementation later for better performance.