Various fixes to bring rparse into line with rust/master

I'm still getting a bunch of type and lifetime errors, but at least I've got it further along to being fixed.