wikidiff: additional changes in order to get wikidiff working with newer code