Yoma 27: Lottery after Lottery

Arranging the wood for the fire - if a non-kohen does this, he is subject to death. If he did it, he should disassemble and reassemble it (which latter part makes no sense!). The kohen needs to step in and participate. But some nighttime activities are permitted to non-kohanim. Until it seems clear that everything is lined up with the daytime! Also, shouldn't the fact that a non-kohen could be put to death for this, isn't it enough of an activity to warrant a lottery? But it IS part of the lottery from the morning terumat ha-deshen. Which brings us back to the night vs. day tasks. And what kind of tasks get a lottery or not. Which is not entirely clear.