Supporting multiple indexer arguments for multidimensional collections
Refactoring grammar text, removing 'or'/'and' for now
Adding properties to object nodes