Optimise iterstraight (inspi by commit 0b786af9e4549896f1a7045601e448a3f68b0a6d )