I know most use the standard procedure of squaring off the back of the bolt head, then reordering the baffle and wave washer. While that works, and I've done it, I never have liked it. Turning off the well formed radius on the back of the bolt head introduces a hard corner that's a point of stress concentration. So, I've started turning several thousandths clearance into the ears on the baffle next to the bolt head. This keeps the radius, and keeps the bolt assembly ordered the same, and it keeps the lube on the lugs. It's harder than a banker's heart though so you know what you're in for ahead of time! Just wanted to throw it out as another idea.