Minor optimization for no_smw case