Tidy adiff and bdiff interfaces