Minor jump-handling cleanups.