Align Option methods with Rust