Restore the four different kinds of types that were removed in
e6bcd43ae806aac9b1cbb52c92c2523bbd5fe2de.