Improved recognition of complex structures and variable types.