VE-549: move label normalization to else block.