More consistent use of variables.