Carve up Types.scala

Conflicts:
	src/reflect/scala/reflect/internal/Types.scala