Incorporate (read|write)_uint16 where appropriate