ir: viv now compiles with latest changes.