0e78baf6bc
Also did fmt, and forgot to separate the commits so now the diff is ugly.
Also did fmt, and forgot to separate the commits so now the diff is ugly.