Some cleanup. Added HasText.