Missed some refactoring changes in AF-parallel.