Related to the previous change, remove unneeded length/count fields.