Fix other impls of ExecutionPreProcessor