vim: more cleanup and fixes for show_next/previous handlers