A few appear to have bitrotted a little. There are others we are
actually doing better on, but that will come in the next commit.

Signed-off-by: Austin Seipp <austin@well-typed.com>