Some more indexer fixes due to empty tuple values.