If so, I think a separate commit would be better.