More slight progress on typechecking