Batch reformat to eliminate 23 files with inconsistent formatting that were accumulating across feature branches.