Indent looks weird. Can you run auto-indent on the whole changeset?