This commit contains some refactoring to make ENABLE_SPLIT_PARALLELISM work again. It seems to work for all tools but IBC/HashME. Fixes for those tools are pending consultation with original authors. Some obsolete code was removed as well.