Unrelated changes should be in separate commits.