I’ve pushed patches that should finally fix the build.  (including improved performance in the compiler itself!)

Sorry about the breakage yesterday

Simon