only pass what is needed from args if even

only pass one property of args instead of the whole object. In some cases args is not even needed at all.

This simplifies the code, makes it easier to understand and will help with #1879.

Please let me know what you think about such a change (then I could do some more of it) and if this breaks anything