Rearrange handling of jump tables. Highlights: