Reorganize the tuple header a bit