Fix build, but not compiler(s) yet.
Partially catch-up stage-0 compiler (50-odd failures.)