No objections on that, you are absolutely correct.
Look like 32fd27ec982d3ba43bd4abe1cfe0dce9568f17b6 covers all the cases.