I was mostly concerned about the round-trip case (just to make sure I wrote the annotations right) but backwards-compatibility is good too so I'll add it.