- Improved type detection.