Merge commit '25bacd0a'

* commit '25bacd0a':
  Don't use expressions with side effects in macro parameters

This commit is a noop. It would be reverted in a future merge either
way.
Merged-by: NJames Almer <jamrial@gmail.com>