If the fix looks OK, please also forward it to Factory soonish so that it is ready when we switch the compiler.