Stylistic changes to previously-merged code