This feels like it should be a simpler diff and I think the diff tool just got confused. Presented like this it causes concern because it looks like you're adding and subtracting methods that shouldn't be. I wonder if we can get the diff viewer to realize what's really going on?