Fixes for list index with expressions, and square brackets.