AVALANCHE: Rework some more string uses