Yes, works for me.  Maybe also squash the commits of this PR.