More updates to GSF EBNF