Refactoring: Moved object structure annotation a level up when diffing