This required minor restructuring of how system call tables were saved and restored, but it makes way more sense this way. Updates #2243