That's a really good idea! It simplifies the overall diff a lot.