I worry that unrelated stuff like this is going to create merge conflicts.