Better typed (8/27)

Better typed