BF: Need to be a little stricter to be able to round-trip.