Refactor collect to separate out the computation of the type scheme

and predicates. Try to document how things work. More cleanup is
needed here but I had to draw the line somewhere gosh darn it.