Grammar: remove redundant undefined-checking