build: envkernel: cleanup behaviour

This patch shouldn't actually change behaviour, it just makes the current behaviour more explicit. I had previously made a bit of a mess of this code...