Formatting borked by merge.