I think it's fine as a separate PR. I'm inclined to skip the warning protection, since it sounds complex and hasn't bothered me (or maybe I'm just used to them?).