Further type design iterations

by Mike Hamm