consolidate check-types into check-types-pred, and remove dead code
check-types-pred 3 arg version
oops, path should not be the one on my machine
more dead/misplaced code
more dead code
Merge branch 'modules-rewrite'
Merge branch 'master', remote-tracking branch 'origin' into modules-rewrite