Merge pull request #2921 from lewurm/lower-typechecks-later