Merge "More libbase updates."