More TODO: Lexical scope for keywords