I'll leave it for another commit, but I 100% agree with your analysis.