Yet more grammar changes, fixed examples so they parse