Handle statement endings a bit better
Update to latest Rust master