Port more values to the value/type layout