Never mix structural changes with behavioral changes

It makes it much harder to find bugs. For example with a git bisect.