Setting optional props with base expr fails without `Some(...)` #2034