r9372: further uffi porting