Make ENV accept multiple vars for a single layer

Fixes #2333