Added correct parsing for array variables.