Address roundtripping concerns [1] and [4] in issue #87.

@davvid