- Improved raw types.
Merged.