Updated parsing of variables.