Fix up autojump further.