Comment several pieces of code to allow building, so I can care about porting one piece at a time.