WINDUP-277: Merged jsightler's fix for allowing single conditions.