Update the BNF.

Make it more readable.