Improve TLV serialization macro callability very slightly