Support master compiler

src/testproperties.icl

@@ -4,13 +4,14 @@ import _SystemArray
 import StdBool
 import StdEnum
 import StdFile
-from StdFunc import o
+from StdFunc import flip, o
 import StdMisc
 import StdOrdList
 import StdString
 import StdTuple
 
-import Control.Monad => qualified join
+import Control.Applicative
+from Control.Monad import class Monad(..), sequence, =<<, foldM
 import Data.Error
 from Data.Func import $, mapSt, on, `on`, seqSt
 import Data.Functor
@@ -31,7 +32,11 @@ import Text.Language
 import Clean.Doc
 import Clean.Parse
 import Clean.Parse.Comments
-import Clean.Types.Util => qualified :: Priority, :: TypeDef
+from Clean.Types import :: Type(Func,Type), :: TypeContext, :: TypeRestriction,
+	:: TypeVar, :: TVAssignment,
+	allVars
+from Clean.Types.Util import instance toString Type, instance == Type,
+	assign, assignAll
 
 from syntax import
 	:: FunKind,