Yeah, that would be best. Probably make it a separate commit in that case.