Better diff handling, sort of.