Minor cleanup in datatypes.