Cabalize (cc: #16); rename stuff; try to fix compile errors.