Revert "Type lists, constraint type"

This reverts commit 504fc7db41d2850d94909de371113ef603efc04f.