Resurrected make-the-compiler-happy changes; commented out some broken stuff