Changing the handling of route variables to avoid race conditions when running parallel.