Flesh out cases in type checker