I don't disagree with your conclusions on this, but I'm a little weary of taking this on in this PR. Are you happy for me to extract this one out?