Update to compile with current yi master.