Option type, fixed if def for then/else branches