Fix instance_variable edge case '@var ? []' and tweak regexes