Remove `-buffer` from the commands I moved from ftplugin to plugin...