Do more Empty and Diff reflection refactoring