Also re-add removed codepoint_t; I'm clearly not having my day today.