Some cleanup. Enable experimental 'if let' Rust language feature