Expand headers before BNF

- also cosmetic indentation fixes