it was intended to be a short term hack until we implement getDiffs(),
but apparently we forgot to complete the cleanup task.  So this is just an
originally planned cleanup.
note that there was a bug in the test code.  The change to diff_add_a_data
is not to hide a problem in the tested code, but it's a fix to the test's bug.