Weeding out more jump table things hopefully...