Relax header column requirements for .axf files to allow for additional (ignored) columns
Reorder conditional branches for readability