Just updating code to formatted baseline from make format. Correcting formatting deviations introduced from https://developer.blender.org/D14922 and https://developer.blender.org/rBe354ba701a0090abf131f25f49565660d8a70d0b
(I hope this minor cosmetic cleanup stuff isn't seen as bike-shedding.)