Scripts/EoE: More optimisations thx to Krofna