Change parser to emit join expressions with indexes