Yup, your workflow works. I'll rebase & submit it for you.