This is a sane approach. I'll try to propose this to the team to see if this sticks, hehe.