Not concerning this part, but stuff not contained in the PR I saw while checking it:
L994, L1108, L1121: drop else
L1080+, L1118+, L1175+: invert and move continue below or drop else
If there are ASM-based performance concerns, feel free to ignore this comment.