Added returns to Grammar elements