Pruning logic for duplicate search branches
Less passing around unnecessary None