Make code experimental parser compatible

We're using the experimental parser, and it was crashing on a few places so I fixed them. Maybe more work is needed, but this is a start.