The compiler compiles again (rolled back misguided changes from earlier commit).