Yes; I agree - I will try to get your PR reviewed/merged today or Monday.

And, I think I can just make this serializer J2 (no need for both, I think - if someone really, really wants a 1.x version, they can make their own).