Added support for typed vars.