bootstrapping w/ new compiler: Merged #233 onto master

see #233 for details