Nice job! Seems you could have put the TypeEnv in a ReaderT as well, might make things slightly easier.