Slight improvements to CBaseObject.