Fix prelexer alternatives for 7 and 8 arguments
Move some modulo handling logic from parser to prelexer
Merge pull request #747 from xzyfer/wip/cleanup-modulo-todos

Fix some recently introduced TODOs