Revert "Force const. expr. in expr_cond outside function"