Fixed handling variables specified using an index notation in the grammar.