Handle potentially multi-word parallelism environment override

Change-Id: I98f58c007502f4254d3817fb898687d818c71cf3