Added type expressions.
Fixes for type expressions.