Merge pull request #2315 from WalterBright/more-jump-tables

do switch jump tables more often