Tiny Diff#metadata refactor