Multiple commits is fine to me. Makes it easier to track changes over time, and also doesn't require a force push nor new PR.