Minor code cleanup for the elf parser