Good question. I think it could be merged like this, and discuss this point in a separate issue.
Other points have been fixed.