Make format strings more consistent within this file

Pure tiny refactoring, no logical changes.

The benefit of consistent format strings is 10 lines of deletion.

The other style changes are added by the rust formatter.