Added type recognition of local variables expressions, and some other basic expressions