AVALANCHE: More function deduplication, remove a magic value