Manual merge: Rewrite vim filetype support.