Progress on adapting HoTT and categories to latest polyproj branch.