Merge from HEAD fixed to variable regular expressions.
add recognizing array variables like @xx.y.z@ as xx(y.z). Note that the regexps show up in multiple places so any changes to the @ var regexps should be made carefully. In particular if @x@ defined and if @x@ nil handle variables special since they can't be derefrenced