Fix InstanceToIndexExpressionMaker