AVALANCHE: Get rid of some more magic values