AlexAnalysis: Rework behavior of --gamma