Improve edit-next/prev-line