FIX: Fewer code paths