It's been a while now, so here's what's piled up in trivial.
Fwiw, since we dropped the policy on header include order, I'll start NACKing those changes in trivial from this point forward, unless they're necessary for some specific reason. With the current modularization effort that constantly touches includes, they just cause unnecessary merge conflicts.
I'll also be more picky about arbitrary cosmetic changes, as they could ping/pong forever.