Include arguments in the resulting dict.
Version 2.0. Simplify handling of variables.