Type System now returns a function(f) where f is f(e, typeSystem).
Resolves OK!