Interdiff for #16.