Reformat some stuff I missed in recent previous commits