I agree. Will do the changes and rebase/squash commits at the same time. Hope you don't mind.