Refactoring of comparison.vim; fix diff with pred