Fix code duplication introduced by CmmContFloWOpt