elf: style tweaks

Trying to diagnose #16560, letting build bot tackle this.