Misc fixes

See individual commits.

.ci/mypy.sh

@@ -10,4 +10,4 @@ fi
 
 set -x
 
-mypy mrhlpr.py mrtest.py --check-untyped-defs --disallow-untyped-calls
\ No newline at end of file
+mypy mrhlpr.py mrtest.py