Use new-style main submodule
Merge branch 'rewrite-racket'