I had a go at suggesting this during development for X1, but it didn't seem to go very far. So I'll try again for X2