Added support for set and local mutable vars