@marcinant If it's too much effort, don't do it.  I'll do some refactoring anyway, so I can as well refactor this, too.

Just squash your commits.