Rearranging some jump tables