Fix for latest Rust and add sexpr parsing